From: Michael Albinus <michael.albinus@gmx.de>
Date: Wed, 9 Dec 2009 10:23:00 +0000 (+0000)
Subject: * net/tramp.el (tramp-handle-insert-directory): Suppress error messages.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~8993
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=be101067ebb61f1e5f71200be6f46a678ac2ab7a;p=emacs.git

* net/tramp.el (tramp-handle-insert-directory): Suppress error messages.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a571757b995..701c52e82c4 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2009-12-09  Michael Albinus  <michael.albinus@gmx.de>
+
+	* net/tramp.el (tramp-handle-insert-directory): Suppress error messages.
+
 2009-12-09  Dan Nicolaescu  <dann@ics.uci.edu>
 
 	Fix short log parsing and fontification.
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index d50b885955b..8bc010d29b2 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -4077,7 +4077,7 @@ This is like `dired-recursive-delete-directory' for Tramp files."
       (if full-directory-p
 	  (tramp-send-command
 	   v
-	   (format "%s %s %s"
+	   (format "%s %s %s 2>/dev/null"
 		   (tramp-get-ls-command v)
 		   switches
 		   (if wildcard
@@ -4126,13 +4126,13 @@ This is like `dired-recursive-delete-directory' for Tramp files."
 		    (end (+ beg (read (current-buffer)))))
 		(if (memq (char-after end) '(?\n ?\ ))
 		    ;; End is followed by \n or by " -> ".
-		    (put-text-property start end 'dired-filename t)))))
-	  ;; Remove trailing lines.
-	  (goto-char (tramp-compat-line-beginning-position))
-	  (while (looking-at "//")
-	    (forward-line 1)
-	    (delete-region (match-beginning 0) (point)))))
-      (goto-char (point-max)))))
+		    (put-text-property start end 'dired-filename t))))))
+	;; Remove trailing lines.
+	(goto-char (tramp-compat-line-beginning-position))
+	(while (looking-at "//")
+	  (forward-line 1)
+	  (delete-region (match-beginning 0) (point)))
+	(goto-char (point-max))))))
 
 (defun tramp-handle-unhandled-file-name-directory (filename)
   "Like `unhandled-file-name-directory' for Tramp files."